bitkeeper revision 1.381 (3f27dc6enBi822WMgapFQKZqa0NdBA)

apic.h, setup.c:
  Fix NMI watchdog.

diff --git a/xen/arch/i386/setup.c b/xen/arch/i386/setup.c
index 521f135d48b31d8fd5e2e43936de1e2b8630f43d..059d296568db76df5bc47c8ec1ec39c91d5cb5d8 100644 (file)
--- a/xen/arch/i386/setup.c
+++ b/xen/arch/i386/setup.c
@@ -421,4 +421,6 @@ void __init start_of_day(void)
         barrier();
     }
 #endif
+
+    watchdog_on = 1;
 }

diff --git a/xen/include/asm-i386/apic.h b/xen/include/asm-i386/apic.h
index 264f6bd44b1e0830e9fa78f4e4beecf7554dd69a..705942596c1db14802b2fc0b5e63ef8c7c30c3c2 100644 (file)
--- a/xen/include/asm-i386/apic.h
+++ b/xen/include/asm-i386/apic.h
@@ -82,6 +82,8 @@ extern void enable_APIC_timer(void);
 //extern struct pm_dev *apic_pm_register(pm_dev_t, unsigned long, pm_callback);
 //extern void apic_pm_unregister(struct pm_dev*);
 
+extern unsigned int watchdog_on;
+
 extern unsigned int apic_timer_irqs [NR_CPUS];
 extern int check_nmi_watchdog (void);